$OpenBSD: patch-src_bin_jp2_convert_c,v 1.2 2016/10/18 09:23:34 sthen Exp $
--- src/bin/jp2/convert.c.orig	Wed Sep 28 19:18:16 2016
+++ src/bin/jp2/convert.c	Tue Oct 18 09:42:21 2016
@@ -646,7 +646,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits
     return 1;
 }
 
-#ifdef OPJ_BIG_ENDIAN
+#if defined(OPJ_BIG_ENDIAN) && !defined(swap16)
 
 static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x)
 {
